gnomeos-run.sh: Only create /etc/passwd if we need to
authorColin Walters <walters@verbum.org>
Wed, 25 Jan 2012 17:32:49 +0000 (12:32 -0500)
committerColin Walters <walters@verbum.org>
Wed, 25 Jan 2012 17:32:49 +0000 (12:32 -0500)
Otherwise we blow away data from "adduser"

gnomeos/yocto/gnomeos-run.sh

index 7e0ec4d27d66f57ba1479d55eb557266db4b4a46..7d5ab7066d15d8825e1fe977e22b36c20d730bb0 100755 (executable)
@@ -73,17 +73,18 @@ if ! test -d ostree; then
     mkdir -p -m 0755 ./ostree/var/{log,run,tmp,spool}
     mkdir ostree/repo
     ostree --repo=ostree/repo init
-fi
-cat >ostree/var/passwd << EOF
+
+    cat >ostree/var/passwd << EOF
 root::0:0:root:/:/bin/sh
 dbus:*:1:1:dbus:/:/bin/false
 gdm:*:2:2:gdm:/var/lib/gdm:/bin/false
 EOF
-cat >ostree/var/group << EOF
+    cat >ostree/var/group << EOF
 root:*:0:root
 dbus:*:1:
 gdm:*:2:
 EOF
+fi
 
 cd ostree
 ostree --repo=${OSTREE_REPO} local-clone repo ${BRANCH_PREFIX}runtime ${BRANCH_PREFIX}devel